Micron Document
🎖️GitЯра🎖️

Node / meshtastic / Meshtastic-Android / commits / d03e61a

Commit d03e61af6f832fd3b027bbc31334ab6ac9cddca0

󰉖 Browse tree at this commit

Parents : 916eb51
Author : James Rich <2199651+jamesarich@users.noreply.github.com>
Signature : Signature validation error
Date : 2026-04-12T12:05:52-05:00
Committer : GitHub <noreply@github.com>
Date : 2026-04-12T17:05:52Z

fix(build): remove Compose BOM to resolve compileSdk 37 conflict (#5088)

Changes

4 files changed, 5 insertions(+), 20 deletions(-)

M build-logic/convention/src/main/kotlin/KmpFeatureConventionPlugin.kt -3
M build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt -5
M gradle/libs.versions.toml +4 -11
M mesh_service_example/build.gradle.kts +1 -1

Diff

diff --git a/build-logic/convention/src/main/kotlin/KmpFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KmpFeatureConventionPlugin.kt
index 33278df934..4fef5c6f4a 100644
--- a/build-logic/convention/src/main/kotlin/KmpFeatureConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/KmpFeatureConventionPlugin.kt
@@ -56,9 +56,6 @@ class KmpFeatureConventionPlugin : Plugin<Project> {
}
sourceSets.getByName("androidMain").dependencies {
- // Compose BOM for consistent Android Compose versions
- implementation(target.dependencies.platform(libs.library("androidx-compose-bom")))
-
// Common Android Compose dependencies
implementation(libs.library("accompanist-permissions"))
implementation(libs.library("androidx-activity-compose"))

diff --git a/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt
index bd620f6a53..1d4e2ea567 100644
--- a/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt
+++ b/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt
@@ -26,11 +26,6 @@ internal fun Project.configureAndroidCompose(commonExtension: CommonExtension) {
val hasAndroidTest = project.projectDir.resolve("src/androidTest").exists()
dependencies {
- val bom = libs.library("androidx-compose-bom")
- "implementation"(platform(bom))
- if (hasAndroidTest) {
- "androidTestImplementation"(platform(bom))
- }
"debugImplementation"(libs.library("compose-multiplatform-ui-tooling"))
"implementation"(libs.library("compose-multiplatform-runtime"))
"runtimeOnly"(libs.library("androidx-compose-runtime-tracing"))

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b948d8d166..1cd010b7f3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -118,18 +118,11 @@ androidx-sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version =
androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version = "2.11.2" }
androidx-work-testing = { module = "androidx.work:work-testing", version = "2.11.2" }
-# AndroidX Compose
-androidx-compose-bom = { module = "androidx.compose:compose-bom-alpha", version = "2026.04.00" }
-androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" } # Only used by deprecated mesh_service_example — remove when that module is deleted
-androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
-androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
+# AndroidX Compose (explicit versions — BOM removed to avoid transitive compileSdk conflicts with CMP adaptive fork)
+androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version = "1.7.8" } # Only used by deprecated mesh_service_example — remove when that module is deleted
androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "androidxTracing" }
-androidx-compose-ui = { module = "androidx.compose.ui:ui" }
-androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
-androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
-androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text" }
-androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
-androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
+androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.11.0-rc01" }
+androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version = "1.11.0-rc01" }
# Compose Multiplatform
compose-multiplatform-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-multiplatform" }

diff --git a/mesh_service_example/build.gradle.kts b/mesh_service_example/build.gradle.kts
index 843eeff85c..793735dda7 100644
--- a/mesh_service_example/build.gradle.kts
+++ b/mesh_service_example/build.gradle.kts
@@ -44,7 +44,7 @@ dependencies {
implementation(libs.androidx.activity.compose)
implementation(libs.jetbrains.lifecycle.viewmodel.compose)
implementation(libs.jetbrains.lifecycle.runtime)
- implementation(libs.androidx.compose.material3)
+ implementation(libs.compose.multiplatform.material3)
implementation(libs.androidx.compose.material.iconsExtended)
implementation(libs.material)

Served by rngit 1.5.4 - Generated in 0.05s